ci: fix merge-queue trigger gaps and run CI on develop + main - #278
Merged
Conversation
Default branch moved to develop; keep CI running on both develop and main. Also close two merge-queue trigger mismatches surfaced during a workflow trigger audit. - ci/typecheck/unit-tests/ui-tests: add `develop` to push branches so post-merge runs happen on both develop and main. - pr-tittle-check: add a `merge_group` trigger and guard the validate step with `if: github.event_name != 'merge_group'`. As a required check it was never reporting on the queue commit, leaving the merge queue stuck "waiting for status to be reported"; it now reports success without re-validating (the title can't change in the queue). - linter (Frappe Linter): drop `if: github.event_name == 'pull_request'` so lint is enforced in the merge queue instead of being skipped (a skipped required check counts as green). - linter (Vulnerable Dependency Check): restrict to pull_request plus a new weekly schedule, and keep it off merge_group/push so a freshly published CVE in the external advisory DB can't block a queued merge. - ci: rename concurrency prefix main-buzz -> ci-buzz now that main is not the default branch (no functional effect). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
harshtandiya has reached the 50-credit limit for trial accounts. To continue receiving code reviews, upgrade your plan.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa
There was a problem hiding this comment.
harshtandiya has reached the 50-credit limit for trial accounts. To continue receiving code reviews, upgrade your plan.
Contributor
|
Successfully created backport PR for |
harshtandiya
added a commit
that referenced
this pull request
Jul 23, 2026
ci: fix merge-queue trigger gaps and run CI on develop + main (#278) * ci: fix merge-queue trigger gaps and add develop to CI branches Default branch moved to develop; keep CI running on both develop and main. Also close two merge-queue trigger mismatches surfaced during a workflow trigger audit. - ci/typecheck/unit-tests/ui-tests: add `develop` to push branches so post-merge runs happen on both develop and main. - pr-tittle-check: add a `merge_group` trigger and guard the validate step with `if: github.event_name != 'merge_group'`. As a required check it was never reporting on the queue commit, leaving the merge queue stuck "waiting for status to be reported"; it now reports success without re-validating (the title can't change in the queue). - linter (Frappe Linter): drop `if: github.event_name == 'pull_request'` so lint is enforced in the merge queue instead of being skipped (a skipped required check counts as green). - linter (Vulnerable Dependency Check): restrict to pull_request plus a new weekly schedule, and keep it off merge_group/push so a freshly published CVE in the external advisory DB can't block a queued merge. - ci: rename concurrency prefix main-buzz -> ci-buzz now that main is not the default branch (no functional effect). Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa * ci: trim verbose workflow comments Claude-Session: https://claude.ai/code/session_013EYfuce7SdhQDyZNCRMaNa --------- (cherry picked from commit 2e16e49) Co-authored-by: Harsh Tandiya <harsh.tandiya@gmail.com> Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Audit of the CI workflow triggers, plus adjustments for the default branch move to
develop(while keeping CI running onmaintoo).Two workflows had required status checks that don't behave correctly with the merge queue — the flagship being the PR-title check, which never reports on the
merge_groupcommit and leaves the queue stuck "Expected — Waiting for status to be reported."Changes
Branch coverage (default branch is now
develop)ci.yml,typecheck.yml,unit-tests.yml,ui-tests.yml: adddeveloptopush.branches(keptmain).pull_requeststays unfiltered so PRs to either branch still run.Merge-queue correctness
pr-tittle-check.yml: add amerge_grouptrigger and guard the validation step withif: github.event_name != 'merge_group'. The check now reports success on the queue commit instead of hanging forever (the title can't change inside the queue, so there's nothing to re-validate).linter.yml→ Frappe Linter: dropif: github.event_name == 'pull_request'so lint is actually enforced in the merge queue. Previously it was skipped there, and a skipped required check counts as green — i.e. lint was silently bypassed on the way in.Dependency scan timing
linter.yml→ Vulnerable Dependency Check: restrict topull_requestplus a new weeklyschedule(Mondays 00:00 UTC), and keep it offmerge_group/push.pip-auditreads an external advisory DB, so its result depends on when it runs — running it in the queue meant a freshly published CVE could block an otherwise-good merge on something the author can't fix.Cosmetic
ci.yml: rename concurrency prefixmain-buzz-*→ci-buzz-*now thatmainisn't the default branch. No functional effect (concurrency group names don't affect required-check names).Notes / follow-up
developonly or onmaintoo, so the required-check list in branch protection is set for the right branch(es). This PR'son:blocks work for either sincemerge_groupneeds no branch filter.🤖 Generated with Claude Code
Generated by Claude Code